mode spinner replaced with tab and additional contexts