Touching up some theming issues
Touching up some theming issues