fixed some merge issues @davestroud
design -done- for now.  touch up edit and delete buttons, that may be all that;s left @davestroud