More styling and layout updates.
Fixes issue with settings not working properly.