Fixes for theme and inital layout 6.2