added shopcontroller
fix layout conflict