Tidy up libraries and tweak on classphotos