Improved civilian UI