removed slug page, replaced with url
fixed issue with template and stylesheet views
fixed merge conflicts