Recent changes that broke layout and formatting. Fixing.