Fixed body overflow issues