Some UI Bug Fixes