Clean-up link names and fix style bugs