Minor adjustments to Flat theme