Remove already resolved FIXME
Add FIXME about UI glitch