Complete UI update and fixed associated lint