keep shopping and css fixes
Merge branch 'working'