Some more CSS and HTML tuning. WIP 1