More gui work + small fixes