Wider sidebar to accommodate "add" and "edit" buttons

Conflicts:
	admin/css/screen.css
Wider side panel to fit "add" and "edit" button

Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.

Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss