#22 Merge sidebar options into tabs