still some fine tuning for nice links