Minor visual changes and fixes