use stars for ratings
add cancel button
merge upstream