Added fullscreen switch to settings (UI only), some code clean-up