Layout fix to previous