Adding overflow for primary view, and adding calendar