Visual clean-up and adding of Satya samples