Adjust code layout in spec/app.rb
Sync devtools