Minor layout fixes and image optimisation