This is consistent with handling on in-train info displays

This prevents key collisions

Also cleaned up superfluous code

The latter is the official library

This aims to improve the contribution experience by separating panels out as much as possible