Bug Fixes

Responsiveness