Put almost everything back into application, still kept main > home clean