Revert "Revert "Custom Tab""

This reverts commit 2a3bc930341daf6882f0306b1abbfa04c03c543e.