Updated UI stuff - slot assignments
Merge origin/master