Added redirect button and fixed duplicate item