Issue #16. Modals fixed