style
fixed widths
merge conflict resolution
fixing style issues, not yet complete
adjust for mobile
style
Merge branch 'master' into stores