Added battery polarity labels

Also cleaned up layout slightly