Tidying Up

There are still a few bugs related to the add/drop page.  But it is
mostly working.