show pics desc
cherrypick navbar
Merge branch 'quickbranch'
Adds layout , fix shop show page and drink show page, fixs devise