Save btn handler fixed, todos removed