Added view switch & mail button