Modified functionality and Deployment preparatiion

1.Fixed bug's
2.Modified project for deployment