Redesign. Todo updated.