Refactored groups to add permissions form