Cleanup whitespace in layout