A few more bug fixes/tweaks for the gallery view