making settings CSS less than awful
comments in CSS
improved layout and CSS of settings
fixing merge conflicts