Added new layout and class for mail stuff