BZ-9676 - adding final touches to modal