Fix Chrome refresh bug
Some UI changes
Merge branch 'trainee' of https://github.com/ingilniero/demo-store into trainee