updated r2_index
resolve megre conflict
Added header and nav bar