Return responsive layout.
Merge branch 'feature/72-return-responsive' into staging