switch to modal
small tweaks