Beta 1.21: UI inconsistencies

There’s a bit of inconsistency for the process of exiting a battle:

Admitting defeat on an online challenge drops you to to the challenge select screen
Hitting ‘view stats’ on an online win drops you to stats, then the challenge select screen
Hitting ‘Quit’ on an online win drops you to battle deployment
Admitting defeat on an singleplayer map drops you to battle deployment
Hitting ‘show stats’ on an singleplayer win drops you to stats, then battle deployment
Hitting ‘OK’ on an offline win drops you to the research screen

I rarely, if ever, want to be dropped to the challenge select or the research screen. I have to remember and find the challenge in the list again, and I have everything unlocked - I often want to re-run singleplayer for a higher score or re-try the given challenge. Could we update the labels on these?

Additionally, I cannot seem to get the scrollbar on the design picker to work for me - once I have beyond 40 designs on there I must delete some to reach the end.