External Scripts removed + code cleanup + view order cleaned