[GP,LA]{test after code} better behaviour of next/previous buttons, removed unneeded functions