Refactor Markup and Styles to be Responsive