Changed some layout
Merge branch '89ao_theme'