cleaned up all the UI's so far. Better alignment
Merge pull request #149 from jivedesign/master

cleaned up all the UI's so far. Better alignment
Merge pull request #150 from CMPUT301F14T03/master

adding joshs changes to dev