Restructured sender and got rid of base template on account verify page