Refactor profile display

This resolve #175 a different way. Hopefully more to the liking of all :)