Implemented changes for scanning in scan screen, ui changes for button text issue, UI changes for drop down for unit list