Clean up groups layout