Fix style inconsistencies from layout change