Changed base page to dynamicly update