_s: Image navigation improvements
Merge pull request #2 from vaibhavkanwal/master

Image navigation improvements