Fixed the responsiveness issues