Feature/pdsc 4 refactor ui code harvest