Improve how circuits are displayed to the user on Android

TBA work on parent ticket