Fixed modals. More GUI tweaks