Additional UI elements and refactoring per the new user permissions and requests.