fixes issues with floatings
Merge pull request #1795 from FinalAngel/develop

fixes issues with floatings in grids