Fix cell and axis choices