merged anil changes(feedback, contact and etc..)