Redesign finished. Fixes #74