Changed the queries to include relevant information
changed the query structures
Major changes i don't even know where to start....
There are some html stuff that is being changed but will be finalized in the coming days