Merge branch 'master' into layout
remove unneeded views
inital refactor of layout
recovered image zoom from stash
working commit
running commit for layout
Merge branch 'layout'