Fix image resource path to re-enable overlay close links
Add action boxes and include upstream structure changes