Ui/chng b

This pull contains 2 commits, my changes from Sunday and changes from today.