Fixed up CSE1240 and adding keyboard shortcuts