Issues/1155 tab bar design

Closes #1155