all popups changed into modals. 
no bootstrap check.
fixed another popup
Merge branch 'popups-into-modals'