misc layout fixes