Fixed layout errors