fixed layout on mobile/tablet
fix merge conflicts