- Change some UI in terms of buttons on the button bar at the bottom

Change-Id: Ie526e9e75fae1da92a10c02344ad4175c54a532e