Merge DEV

Modify CSS to support the migration of pages from table-based to
div-based
layouts.