Fix some layout discrepancies