Improved UI

Removed unused code, various other clean ups