Added Responsiveness, other changes