ui improvements - still huge view switch bug