few small tweaks and bugs fixed with modal