Pages and navbar updated
Merge pull request #7 from FMDev/git'n-some-work-done

Pages and navbar updated