While preparing for dark mode I've taken the time to improve the UI a bit. Still not entirely sure I'm there yet.
