Refactored CSS a little so only common stuff lives in main.css
Modified toolbar to make sense for each view. Added stub for upload
button.