Improved UI + some bugfixes