More layout adjusts