changed layout and @media
Merge branch 'development'