Bug fixes and UI adjustments