Many visual improvements
Adjusting further to the div-based layout