Added option for animations and improved entry box