Added email button and changed ordering