Improved closing of modal, user menu, and improved design