fixed layout bug so the headers work. formatted files for consistent style.