Layout fixed, file clean