Several layout fixes