cleaning
fixed keyboard navigation