Tidy up the interface for the maint page
Merge branch 'alpha' of github.personal:jvazquez/organization into alpha