Another bugfix attempt
Modal content and JS functionality