Better flow for list screen

Better user experience and flow for transitioning between modes in the
list screen.