improve toggle cases in compose view