First go at adapting for wider screens