fix some layout errors