Reorganize header css/js