Added all main screens and services