Clean up row layouts to match mockups and be internally consistent.