touch of theming and fixes