fixes for cross button functionality