Radar, menu,  state fixes

ALSO THE MAIN