Fix a logic bug & make show_toolbar option persistent.