updated UI and some bug fixes