2291249 Modal display

Not sure this is exactly how we want to implement this, but I just wanted to get it working