Fix threading, update design