Add Icons, Make Timeouts, add click functionality