Fixed the layout problem
Merge branch 'development' of github.com:bashantad/Industry-project into development