UI Updates and fixes

Change-Id: I256929f9371c2f8cd4e4988f2b4e94ceb3d865aa