Added delivery method
Started fixing displaying problems