Edit mode buttons are now within toolbar