Layout fixes. Fix uncombined tokens.