Design fixes, new controller