Task #35: Change css for tabs
Merge branch '35' into dev