Layout fix for the last commit