Improve mail and env pages