Improve UI slightly
Current flag moved