polishing, add few links to move inside app