Sahara small UI fixes

Change-Id: I22486b5697ff9f6ffeae0b93e5564f254f732987
Closes-Bug: #1371370
Merge "Sahara small UI fixes"