Backend: cosmetic

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Frontend: Fix: Whenever possible, make sure the current page remains selected in the page list

Signed-off-by: Jerome Flesch <jflesch@gmail.com>