Horz alignment
Major Clean up