23th commit - links view/controller fix