UI update + code cleanup