Some tweaks to the appearance and layout