Fix remaining buffer and use wrapping div for positive negative