Cleanup, preliminary code for keyboard nav