HTML structure + CSS tuning. WIP 2