Code refactor and Fixed issues in responsiveness.