Resolve issue #1 and reorganize the navbar link's