Minor graphical fixes and removal of code

Changed the options menu layout and removed some unwanted code.