added extra protection in case you try to set the rate to None
more options in the drop down and no inline editing