Remove cookie functions & fix key navigation