Fix bug with freewall
Change shop view