Theming dashboard, more markup changes