Added popup modals as system feedback