Made some changes and added tabs.
More changes. Working on the jquery stuff
Merge pull request #1 from jackd36/Mike-Branch

Mike branch