Improvements for RWD
Bugfix for prev/next navigation