Adding layout fixes