Fixed some UI bugs I reintroduced