Fixed bugs and Implemented new features with new UI