Home Screen Cleanup and Remerge

Haaaaayyyyy BRUDA