Expanded first run initialization
Merge branch 'app-firstrun'