Fix the add alarm and added migration
Fix bugs on alarm page
revert changes back