Factored pi-button and added a spinner to cover the thumbnail when selected