Better toggling between view/edit