updated template to simplify link tags