Touching up some theming issues