Fixed directions popup
Added Badges
Fixed Bugs
Fixed Final Bugs