For the momentary switches, it is better to use 10K pull-downs instead of pull-ups, and make the switches connect them to VDD. This way you won't need to remove the programmer when you run and test the PIC.
You may be able to do this with signals too, depending on the origin of the signals...