added pages dir for views, some minor changes
merged