Minor tweaks to Tabbed interface.
Resolved merge conflict.