Fixes for theme and inital layout 6.2
Merge pull request #2 from arzare/master

Fixes for theme and inital layout 6.2