Updated views and function to fix months issues