mobile column width fixes
conflicts resolved