Improvements on admin theming