added modals
Fixed Modal issue..finally