Improved calendar add function, & re-implemented barcode popup to test