Bug fix on local notification and some UI tuning