Minor readability and UI tweaks