Bugfixing (test & UI)