Fixed problems with face layout