Updates for Mother editing.
Merge pull request #36 from jasich/master

Updates to UI from Joe.