floating grid and merge fixes