It looks fairly close to right but you look to have hit the bug caused by modifications in more than one view from the dotted rats nest lines connecting unused pins on the 328. I'd advise starting fresh with the Uno R3 from parts as that's what you will use. I'd suggest putting 1K or so pull up resistors to +5V on the Arduino pin side of the switches as well so they switch the port between 0 (when the switch is closed) and 5V when its open. Otherwise you look to be pretty much fine. Then follow the rats nest lines in breadboard to get the wiring for the breadboard side.
Peter
