Fixed edit name bug, added some twopane stuff.