Fix view and links