removed old code
small styling
conflicts fixes
added passenger form