styled a some pages
add cartoon forest
resolve conflict