Added helpers, finalised albums modal