This branch was created for testing the app.

Changes made here are during the testing phase.
And the feedbacks recevied are implemented.