Fixed some layout errors