Bootstrap modal added - Issue fixes