Some basic fixes for 20th anniversary

Doesn’t have full width modal but more pain than it’s worth.