big fixes and redesign