Edit groups on edit page and some fixes
Tried to add beautiful navbar
Merge with master