Updating some UI fixes