Improved styles, add counter linking