Fixed ordering problem, focus issue still exists