refactor and smoothed out tranistion screens