Fixed link matching and some css changes