Fixed dispaly issues