Further layout work on Settings window