Layout tweaks and updated images