Got rid of layout errors