refactoring/simplifying UI transitions