formatting and link fixing
fixed base.html merge duplication