refactor showroom view
Merge branch 'master' of github.com:a25kk/newe