Working on header, also added mod rewrite
Merge fix