Improve UI and Bugfixing