Layout tweeks for a better visualization