Fixed editing and deleting with some nice FFOS building blocks.