Last changes and fixes in UI