changed plain-button from blue to brown, again
misc. styling crap
Merge branch 'refs/heads/master' into test