Got rid of some layout errors