working return, issue, with errors. added keyboard navigation