Made type changes, finished media queries