Fix layouts, add some jlayouts
Fix edit inconsistencies
Merge pull request #4 from elinw/davidsbranch

Pull from Elin