Redesign to version 1.1