General look is fixed

Paired by Michael and Richard