Layout improvement, CPU usage fix