Working on resolution

Merge Conflict :(
Fixing it up!
CSS for the win

New css, fixed and pretty.