More styles and fix alert messages