Made things responsive yo
Merge