Improve attachment grid behaviour