Add modal to partial, fix wording and layout