Some UI fix
Add alert