made almost everything dynamic, added missing pages