Fix #4: Slide index handling (nav update etc.)
Fix #4: Improve readability of last commit