Couple Bug Fixes for the UI