Fixed more bugs and UI canges