Updated Widget Controller