fixes to show apply button inside popup