Added customizable links; bug fixes