Slight tidy up plus alter the edit_only functionality