admin: prevent nesting modal-body

plus make code better readable
merge from 0.12