Update stylesheet to make code DRY and update media queries