Adds name and changes the about page structure
adding missing files
fixing conflicts