Cleaning up small ui errors