realigned and adjust layout