Upgrade - Startup Items

- Add Startup Items
- Minor Fix