made a new header file, changed css
tried to fix merge conflicts