included / fixed the implementation of the "whatsnext"-page