UI modifications and code cleanup