fixed display issue and performance tweaks