Fixed More UI Bugs.