added another limitation
modals integrated for main screen