Redesign

v 0.2