removed annoying backup copies
Updated pages to make better use of includes and increase modularity