dimensions fix for the preferences
Lots of Layout changes, feel free to revert