fixes selected layout, select a theme, preview

 fixes selected layout, select a theme, preview
https://www.pivotaltracker.com/n/projects/877197/stories/75998652