Added more GUI stuff