ui updates and bug fixes