Begin switching to new toolbar + layout