More streamlining of layouts
Added shops and items