Update admin screens. Bug fixes. Some refactoring.