Small fixes to main schematics and layer template