adding some changes for responsiveness and stuff