Adjusted the settings options to align better with their respective
shapes and lines.  Also made the line options rotate with the line.