Add download button and other improvememts