Update email behavior, improve page behavior