Fixed add, view, index and update