some changes in cabinet and templates