Added link styles
Template cleanup