Further improve presentation