Changed order of widget creation to account for tab order