Bug fixes and make UI more responsive