Completed Sort by Types and Re-arranged Tool

Sort types in Product view are sorted by types as per asana notes.
Tool arranged as per asana notes.