Hot fixes + adding static pages from admin panel