UserInterface updated, Small bugfixes