fixed some layout errors