Remove TODOs and add "key" icon description