Various UI Bug Fixes