made settings have 400px height so that it is enough to contain its contents even when android shrinks the screen down really small when you open up the keyboard
added a todo
making settings CSS less than awful
comments in CSS
improved layout and CSS of settings
fixing merge conflicts