Done restructuring entire app layout.