Addressed responsiveness issues