Next step in move to fragment based layout. Most things are done, some
bugs with backstack still exist.