refactor alert views (II) + some minor enhancements