Fixed timeouts not being cleared correctly, minor UI improvements