Add Supplies modal Finished.
Fix scroll
Finish calculations for Drug Order.
Fix conflicts.