Refactored controllers
Added size to Group