Move Today option to the top. #532