changed buttons
Modified to use notifications
Added notifications