First commit of generalize app homescreening code.
Cleanup and style renaming to avoid style colision.