Added design feedback changes - changes for mobile and tablet
Resolving a conflict