Ui improvements

A few tweaks for consistency, easier to read and slightly more accurate.