Add modal and some modifications