Added changes for responsiveness