Dc/Melanie |#3885 #3886| Adding files, UI changes , text changes