Redesign and Bugfixes