Fix modal popup; Refactor modal CSS structure