Fix ui a bit