Fixed new voyage button bugs
Got the datatables working and search
Fixed merge conflicts