Added buttons, icons