UPDATED
* Minor UI updates
