Issues fixing and UI changes