fix overlap on displays with a width of <= 768
an even better solution
Merge branch 'development' into staging
Merge branch 'staging'