Reorganize the setup code for the General page

Now everything that's part of one tab is placed together.

(cherry picked from commit 21c51ec71c38ae55f74ad8102c2f3a4abd13f95e)