BUGFIX: more bugs in montage view