added simple page template and merging uploads