Improve Preview button and add it on the list