Added more gui related stuff