fixed #123 & month nav issue
links fixed
Merge branch 'edge' into dev