Wiring Check & Resistor Questions

OK. I have revised the circuits based on your feedback. How does it look now?

Here is the link for the LEDs. They are embedded to the switches.