fix the issue and adjust the layout