Adds several improvements on design and usability