Improve users table
Fix Reminder