More UI cleanup and bug fixes.