working on links with some app changes