More UI clean up