Added theme layout
Improved style of theme