Improve new app experience

_Work in Progress_

Issue #31