Added BASE_PATH to some links