layout changes made

mostly moved boxes around to not look so crappy
Merge pull request #22 from josephbooth/master

box updates