lots of small changes: tables formatted, buttons added