Some CSS Work - Moving styles away from inline

I've commented out the old so if you guys don't like it we can just
uncomment it.