Adding Edit Reminder

cleaned up a lot of other code as well