Added subpage masterpage and removed all dependencies on session