National: restored a few changes lost in merge, some additional button styling.