Add more static pages and basic improvement & bugfix