Added editing functionality and debugged fixed keyboard