* UI improvements
* Removed unnecessary text buttons
* General code cleanups