Fix the layout previous fix