Updated S3 sample 

Refactored code, updated UI code, and added new icons