Grid, session and order fixes