Incorporate fluid layout + overall style consolidation/clean-up