Better UI, mail sending, uploader code reorganization