Refactored members into individual templates and standardized font-size
Fixed merge