Fix Display Issue