- tidy up and refactoring
- added further gestures for picture views