Moved to grid solution and looks wonderful