Some restyling, some refactoring. Split some admin functions.
Some restyling, some refactoring. Split some admin functions.