Optimized testing UI
Removing modals after closing