Added Units Enum & Custom MaterialPanel