Reorganize delivery page elements.
Clean up css property name and element id.