Attempted layout fixes