Code Cleanup and HomeScreen Addition

Still need to resolve best way to navigate pages