Major code formatting changes
Make label placement smarter.  Add setting for labels on or off