Minor cosmetics on frontend