Revert "Subtabs stubbed out until completed - stable build"

This reverts commit a5d72191be3e5fd1829e8d149e957aa3a504f53e.