added line width picker and other changes