Fixes for design step of study wizard