Added more UI stuff