major refactor of server.rb & use of sinatra-partial