Analysis software for my opening repertoire

I’m trying to record my opening repertoire with notes and sidelines. I’ve been using the chess.com analysis feature and storing the openings in collections. It’s pretty good, but has some downsides, listed below. Does anyone know of a better software for this?

Downside 1) it’s not on the app. I prefer to mostly use my phone for chess. I can use the website via my phone, but adding notes seems to be impossible via the phone.

Downside 2) it doesn’t show multi-level sidelines very well. If the mainline is, say, 4. Nf3, but I have multiple variations of a sideline with 4. Bc4, the Bc4 sidelines all get grouped together in a single messy paragraph. Not good to help visualize the variants.