Made lots of changes and added dynamic pages