Refactored tabs (now that I have some minimal testing...)