Aesthetics improvements