Added clear button, made grid wrap around