Fix other layout problems