client fixes for showing the appropriate view at each state