Bugs/fix ug pg

also some minor ui things