Made changes to Tabs assignment based on feedback.
Added AJAX tabs assignment