UPdated with working keyboard removal and view switching