WIP: petitscours: UI improvements #843

Draft
llanteri wants to merge 6 commits from petitscours into master

6 commits