Added shelf page and made some model changes