Fixed a few litle UI bugs