Some tweaks to improve appearance