Fix the modal

Ninja's over a few of dylan's changes from commits I'm going to abandon

Change-Id: Ib4e20704bb5970d674e840b8c74538b381244288