After merge changes and a few extra tweaks to get the Modal working right.