Reorganized order and changed header styles