UI and bug clean up