Minor restructuring for more better ES calls
Tweaked tab names and related styling