Added more gui controls