Removed fill colour so it can be overriden
Added substrate drawing