Add view to subview group & refactor