Header changes and active tab implementation
Conflict merge