Merged Daniel's UI Changes

1. merged changes from Daniel's UI design that I missed in the previous
cmmit