2nd set review 1

These are the remaining files.

Screenshots will need to be reviewed and some areas might need to be reviewed more intensively