<pulkit> manage app link and some refactoring done