Added Icons
cleaned up a lot of code, optimised code by deleting redundant blocks