Stability and UI improvements