Closes #151 - add edit button to topbar, move things around a bit.