updated changes for some layout