Adding album links and clean up