Remove old code
Re-implemented up and down keys, minor fix