Fixed Display issues