bug fixes and UI clean up