Fine tune Label to show text at position as expected
Re-format some code