First pass at improving overall display of sorts.