Bug fixes

UI improvements + bug fixes