Refactored code

Made tag navigation available (issue #5).