master toggle and ui tweaks