Improved UI, misc changes