Added testing mode and improved UI