refactoring
block sinatra to 1.3.3
fixes
refactoring
refactoring
refactoring
cleanup view
1.8 fix