moved some stuff around; minor fixes in view and sinatra routing