updated views to match desired functionality