Revision 2 updates for 267

This brings revision 2 more in line with revision 3 styling