Add Material Tab and optimize