goal fix + small screens fix