Reformat controls area a bit, add sample data when app storage is uninitialized, fix a few bugs.