Cleaned up bar drawing, changed scale draw behavior