fixed click bug
fixed conflicts and css bug
updated router to include view manager for terms and privacy
Merge pull request #378 from CalvinFernandez/fixing-click-bug

fixed click bug