general first round of changes to simplify css markup, improve display
and clean up code