Bit of clean up. Work on HomeActivity

Cleaned up groups. Working on Home Activity displaying correclty