Better layouts

TODO: Breakout styles to a css