Fixed modal issue and started working with presence