Merged styles
Merged with new slider
Merge branch 'dev' into Richard
Uniform style for tabs