better layout and alert