Fixed a more options bug. Intermediate check-in, some work on edit page.