Rearrange retail subscription form
Display current retail subscription details
Move end retail subscription button inside form
Add entity subscription form
Remove redundant acceptance tests