improved views and removed calendar constraint