Fixed some code based on code review. Fixed resources names, Implemented sub classes