upgrade some things and update the style a bit
rearrange things. yay!
iron-router later