Code cleanup
Using a responsive grid