edit Field.java and Layout.java
Merge remote-tracking branch 'origin/layout' into test
test for layout