Responsive

The new way I tried doing the responsiveness ended up not working, so...
Fixing merge conflict