variou changes to view logic