Added widgets. Indentation needs to be fixed