Added Better Responsiveness and Cleaned Up Code