batch of crappy fixes

general layout, so-me buttons, blah blah blarg