Adding modals
Merge branches 'CheapeDev' and 'CheapeDev' of https://github.com/CheapeOne/ACV into CheapeDev