#14 Set proper active tabs
Merge branch 'enhancement14' into 0.2.0-update