New layout fixes