#660 Moved add block modal to correct view and controller