Fixed some more UI issues

Specifically, timer stuff