Refactoring and added group form