fixing conflicts between mobile/desktop views