Fix several presentation issues