Bug fixes and better UI feedback