Update for 2.5 for
Update for 21
Update for modal script
Update to use CSS layout
update for new context