Improve the css
Improve the theme