changes to case layout & some other minor changes