MASTER: Updated some classes for the sake of styling.