Two step layout improved
Merge branches 'feature/1770-new-upgrade-page' and 'feature/1770-new-upgrade-page' of https://github.com/jsbin/jsbin into feature/1770-new-upgrade-page