Added handling fee for calculated option
Further work on the listing page to improve UI during loading etc