2.0 Responsiveness

bug fixes