Re-work indentation and fix display group detail if there is no group_type