Few changes in get/give ride some layout issues!!