Add support for admin screens, better mapping