Fixed substrate drawing and refactored location