add sample and composer support
fix many pages