Updating to fix the problems with editing non-pages and cleaning up the
UI a bit