fix delay
adjust layout