Merged and became more politically correct
Fixed page name
More css fixes