CLSN-638 : code review for all screens done