Some more updates to homescreen, started building group screen