overhauls to some ui, took a quick look through some css and refactored
Merge remote-tracking branch 'origin/master'