Optimised images and improved navigation