Merge pull request #1 from traveloop/master

Merging latest changes (includes JS work)
front end tweaks
html tweak
Merge pull request #3 from traveloop/front-end

Pulled index and planner pages together