Added more ui stuff