Fixed tabs, now just have to work on links in tabbed pagination :S
Merge remote-tracking branch 'origin/master'