Improved UI, fixed bugs