Pushed UI + bugfixes from main branch (#22)