Updated ui master
Updated ui tester
Merged master and tester