Added logic to remove appropriate widgets - Doesn't work yet