removed float from modal for scanning barcode and only have cancel button
fixed conflicts