CLO-588 changed file names and worked on modals