Alignment in certify activity
Design fixes for certification activity