fixed typo
[Layout]: Fixed some issue related to new changes