Fixed presentation bugs