better template separation, styles still hard-coded + wiki links