fix for bugs
fix layouts
Merge pull request #19 from Gryphyn23/master

updates in noc