add small refractoring and static pages