Complete UI update and fixed associated lint

#474