Refactored to newIntent pattern without magic strings in screen switching.