Fixed timing UI bugs