Fixed js, added keyboard shortcuts