Major formatting issues fixed