Fixed variable name
Better widget indexing.