Refactor Login Modal and lightbox