Why don't you reply to your first post, so everything is contained in one single thread? Otherwise you will have comments in both threads, and it just makes things a big mess!
Nice work though, although I am unsure as to the purpose of the diodes on the buttons, in my (limited) experience, that would only really be required if you had them in a matrix of some sort.