Added a clear button and a grid