updating styles, fixing line functionality
commodities import
fixed conflicts