Switched inline_add and inline_edit code to use && and ||