Fix merge problem in App.js; fix Node positioning