Updated UI of tabbed pane
Merge branch 'devel' into ui-improvements