updated navigation links with link_to method
Merge branch 'makis-development'