Redesign rerevised

By Malte and me (tm)