Redo layout, add mail and del screen view