Changed everything over to 1 single page