More UI fixes/tweaks. More code cleanup here and there.