Fixed margin and font size issues identified in #2626