Working process and UI improvements