UI update and general fixes