Working on module UI visibility tweaks