GREEN-1864 Styleguide better responsive design and fixes after merging