Fixed presentation issues