Product UI Clean up