More tweaks to css. Closer to the mockup now!