Fixed some bugs with NET and LAYOUT