Views and paths adjusted