Resolving Shipping css conflicts

Also removed redundant style from markup