change grid from 4 columns to 5 columns. and some bug fixing