Refaced the layout.  Fixed some bugs in edit.  Reorganized a lot.