As a previous pull request was taking too much time, combined with development of this display, this is pulled separate to be done when possible (a work in progress, already)