Added responsiveness and simplified code