Added screens and categories