Add more spec, and image
Improve UI