Changing headers and stuff
resolve merge conflict
More mods to backgroun, header, and other stuff