Added more GUI functionality