Finishing up mobile optimisation