Fix presentation issues