Bootstrap tabs in program and organization views
Cleanup git issues
Fixes git conflicts