Added more GUI