Added some new UI buttons
Removed the setTimeouts