fixed #123 & month nav issue