#362 improve navigation code
#363 swipe navigation