UI fix and admin table bug fix