For 2 I think it's fine the way it is, the highlighting solves it for me. For 3 I'll attach a screenshot, it is just the bold button.