made edit act. pg w/ tabs
Merge remote-tracking branch 'upstream/master'