merged all.cc changes with fluid grid layout