Fixed Minor issue and Re tested all Functionality

Final testing done and all functionality are working properly.