Minor adjustments per theme review