some minor changes to the accent panel
fixed merge errors