Merged some display stuff from Sebastian