Improved visual elements, as per Roope's Comments