Fixed timeouts not being cleared correctly (I hope), minor UI improvements
Merge pull request #89 from Rylius/development

Fixed timeouts not being cleared correctly, minor UI improvements