yes you are correct they should be under certain headings i will be attempting to fix the categories up more also