Merge pull request #24 from Adrian2014/label_upgrade

Changes made during demo
Fixed alignment of dropdown menu
Merge branch 'master' of https://github.com/Adrian2014/Historical_Wiki into timeline
Merge pull request #25 from Adrian2014/timeline

Timeline
More changes to match porject direction