Improved UI, various other changes and bug fixes