Fixed links-choices-presentation for latest weblocks, made some refactoring