bug fixes
Merge remote-tracking branch 'upstream/master'
Header updates, forms, tables, buttons.